Prefer /usr/share/info/emacs-24 over /usr/share/info.

Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info.

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.

diff --git a/lisp/info.el b/lisp/info.el
index 6e72e544dd5bfbd8985b5393d8a8fc55d3c46053..d74c80fde979011696e280ec06c3be0a72a451ab 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -211,7 +211,8 @@ A header-line does not scroll with the rest of the buffer."
              (nconc standard-info-dirs (list config-dir))
            (cons config-dir standard-info-dirs))))
     (if (not (eq system-type 'windows-nt))
-       dirs
+        ;; Debian: add per-flavor info directory in front.
+        (cons (format "/usr/share/info/emacs-%d" emacs-major-version) dirs)
       ;; Include the info directory near where Emacs executable was installed.
       (let* ((instdir (file-name-directory invocation-directory))
             (dir1 (expand-file-name "../info/" instdir))